Description: <short summary of the patch>
 TODO: Put a short summary on the line above and replace this paragraph
 with a longer explanation of this change. Complete the meta-information
 with other relevant fields (see below for details). To make it easier, the
 information below has been extracted from the changelog. Adjust it or drop
 it.
 .
 artoolkitplus (2.1.1-1) unstable; urgency=low
 .
   * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
Author: Philippe Coval <rzr@gna.org>

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>

--- artoolkitplus-2.1.1.orig/tools/IdPatGen/IdPatGen.pro
+++ artoolkitplus-2.1.1/tools/IdPatGen/IdPatGen.pro
@@ -3,27 +3,30 @@
 # QMake definitions for IdPatGen
 #
 
-ARTKP ?=../../
-include ($$(ARTKP)/build/linux/options.pro)
+ARTKP=../..
+
+include ($${ARTKP}/build/linux/options.pro)
 
 TEMPLATE = app
 
 TARGET   = idpatgen
 
-QMAKE_CLEAN = $$(ARTKP)/bin/idpatgen
+QMAKE_CLEAN = $${ARTKP}/bin/idpatgen
+
+LIBS += -L$${ARTKP}/lib -lARToolKitPlus
 
-LIBS += -L$$(ARTKP)/lib -lARToolKitPlus
+INCLUDEPATH=$${ARTKP}/include
 
 debug {
-  OBJECTS_DIR     = $$(ARTKP)/tools/IdPatGen/build/linux/debug
+  OBJECTS_DIR     = $${ARTKP}/tools/IdPatGen/build/linux/debug
 }
 
 release {
-  OBJECTS_DIR     = $$(ARTKP)/tools/IdPatGen/build/linux/release
+  OBJECTS_DIR     = $${ARTKP}/tools/IdPatGen/build/linux/release
 }
 
 
-DESTDIR  = $$(ARTKP)/bin
+DESTDIR  = $${ARTKP}/bin
 
 debug {
   message("Building IdPatGen in debug mode ...")
--- artoolkitplus-2.1.1.orig/tools/IdPatGen/src/PN/Image.cpp
+++ artoolkitplus-2.1.1/tools/IdPatGen/src/PN/Image.cpp
@@ -36,6 +36,7 @@
 #include <cstdio>
 #include <cstdlib>
 #include <string>
+#include <string.h>
 
 #if defined(TARGET_HOST_WIN32) || defined(TARGET_HOST_WINCE)
 #include <windows.h>
--- artoolkitplus-2.1.1.orig/tools/IdPatGen/src/PN/ImageTool.cpp
+++ artoolkitplus-2.1.1/tools/IdPatGen/src/PN/ImageTool.cpp
@@ -34,6 +34,7 @@
 
 #include <cstdio>
 #include <string>
+#include <string.h>
 
 #if defined(TARGET_HOST_WIN32) || defined(TARGET_HOST_WINCE)
 #include <windows.h>
--- artoolkitplus-2.1.1.orig/build/linux/options.pro
+++ artoolkitplus-2.1.1/build/linux/options.pro
@@ -24,7 +24,7 @@ equals(ARCH, x86_64) {
 }
 else {
 #  QMAKE_CXXFLAGS      = -mtune=pentium4 -march=pentium4 -msse2 -msse -fpermissive
-  QMAKE_CXXFLAGS      = -mtune=pentium4 -march=pentium4 -msse2 -msse 
+#  QMAKE_CXXFLAGS      = -mtune=pentium4 -march=pentium4 -msse2 -msse 
 }
 
 
@@ -40,17 +40,17 @@ UNAME           = $$system(uname -r)
 LANGUAGE = C++
 
 debug {
-  OBJECTS_DIR     = $$(ARTKP)/build/linux/debug
+  OBJECTS_DIR     = $${ARTKP}/build/linux/debug
 }
 
 release {
-  OBJECTS_DIR     = $$(ARTKP)/build/linux/release
+  OBJECTS_DIR     = $${ARTKP}/build/linux/release
 }
 
-DEPENDPATH      += $$(ARTKP)/include
+DEPENDPATH      += $${ARTKP}/include
 
-INCLUDEPATH     += $$(ARTKP)/include
+INCLUDEPATH     += $${ARTKP}/include
 
-LIBS            += -L$$(ARTKP)/lib
+LIBS            += -L$${ARTKP}/lib
 
 # ############################################################
--- artoolkitplus-2.1.1.orig/src/src.pro
+++ artoolkitplus-2.1.1/src/src.pro
@@ -3,15 +3,17 @@
 # QMake definitions for library
 #
 
-include ($$(ARTKP)/build/linux/options.pro)
+ARTKP=..
+
+include ($${ARTKP}/build/linux/options.pro)
 
 TEMPLATE = lib
 
 TARGET   = ARToolKitPlus
 
-QMAKE_CLEAN = $$(ARTKP)/lib/*
+QMAKE_CLEAN = $${ARTKP}/lib/*
 
-DESTDIR  = $$(ARTKP)/lib
+DESTDIR  = $${ARTKP}/lib
 
 INCLUDEPATH = ../include
 
--- artoolkitplus-2.1.1.orig/src/librpp/rpp_vecmat.cpp
+++ artoolkitplus-2.1.1/src/librpp/rpp_vecmat.cpp
@@ -40,9 +40,11 @@
 
 #ifndef _NO_LIBRPP_
 
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
 
 #include "rpp_vecmat.h"
-#include "math.h"
 #include "assert.h"
 
 
--- artoolkitplus-2.1.1.orig/src/librpp/rpp.cpp
+++ artoolkitplus-2.1.1/src/librpp/rpp.cpp
@@ -45,6 +45,8 @@
 
 
 #include <vector>
+#include <string.h>
+
 #include "assert.h"
 
 #include "rpp.h"
--- artoolkitplus-2.1.1.orig/sample/simple/simple.pro
+++ artoolkitplus-2.1.1/sample/simple/simple.pro
@@ -3,30 +3,30 @@
 # QMake definitions for simple example
 #
 
-include ($$(ARTKP)/build/linux/options.pro)
+ARTKP=../../
+
+include ($${ARTKP}/build/linux/options.pro)
 
 TEMPLATE = app
 
 TARGET   = simple
 
-ARTKP=../../
-
-INCLUDE_PATH= $$(ARTKP)/include
+INCLUDE_PATH= $${ARTKP}/include
 
-QMAKE_CLEAN = $$(ARTKP)/bin/simple
+QMAKE_CLEAN = $${ARTKP}/bin/simple
 
-LIBS += -L$$(ARTKP)/lib -lARToolKitPlus
+LIBS += -L$${ARTKP}/lib -lARToolKitPlus
 
 debug {
-  OBJECTS_DIR     = $$(ARTKP)/sample/simple/build/linux/debug
+  OBJECTS_DIR     = $${ARTKP}/sample/simple/build/linux/debug
 }
 
 release {
-  OBJECTS_DIR     = $$(ARTKP)/sample/simple/build/linux/release
+  OBJECTS_DIR     = $${ARTKP}/sample/simple/build/linux/release
 }
 
 
-DESTDIR  = $$(ARTKP)/bin
+DESTDIR  = $${ARTKP}/bin
 
 debug {
   message("Building simple in debug mode ...")
--- artoolkitplus-2.1.1.orig/sample/multi/multi.pro
+++ artoolkitplus-2.1.1/sample/multi/multi.pro
@@ -2,27 +2,28 @@
 #
 # QMake definitions for simple example
 #
+ARTKP = ../../
 
-include ($$(ARTKP)/build/linux/options.pro)
+include ($${ARTKP}/build/linux/options.pro)
 
 TEMPLATE = app
 
 TARGET   = multi
-ARTKP = ../../
-QMAKE_CLEAN = $$(ARTKP)/bin/multi
 
-LIBS += -L$$(ARTKP)/lib -lARToolKitPlus
+QMAKE_CLEAN = $${ARTKP}/bin/multi
+
+LIBS += -L$${ARTKP}/lib -lARToolKitPlus
 
 debug {
-  OBJECTS_DIR     = $$(ARTKP)/sample/multi/build/linux/debug
+  OBJECTS_DIR     = $${ARTKP}/sample/multi/build/linux/debug
 }
 
 release {
-  OBJECTS_DIR     = $$(ARTKP)/sample/multi/build/linux/release
+  OBJECTS_DIR     = $${ARTKP}/sample/multi/build/linux/release
 }
 
 
-DESTDIR  = $$(ARTKP)/bin
+DESTDIR  = $${ARTKP}/bin
 
 debug {
   message("Building multi in debug mode ...")
